Merge git://git.denx.de/u-boot-uniphier
authorTom Rini <[email protected]>
Sun, 22 Oct 2017 23:21:04 +0000 (19:21 -0400)
committerTom Rini <[email protected]>
Sun, 22 Oct 2017 23:21:04 +0000 (19:21 -0400)

Trivial merge